auto merge of #1060 : alexcrichton/cargo/pr-1012, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 18 Dec 2014 01:50:48 +0000 (01:50 +0000)
committerbors <bors@rust-lang.org>
Thu, 18 Dec 2014 01:50:48 +0000 (01:50 +0000)

Trivial merge